Skip to content

Comments

Adding Comparison and Indexing methods to DataFrameMixin#58

Merged
adamamer20 merged 35 commits intomainfrom
comparisons-mixin
Aug 14, 2024
Merged

Adding Comparison and Indexing methods to DataFrameMixin#58
adamamer20 merged 35 commits intomainfrom
comparisons-mixin

Conversation

@adamamer20
Copy link
Member

@adamamer20 adamamer20 commented Aug 13, 2024

This PR adds some useful methods for comparing DFs with other DFs or Series.
New methods:

  • Logical operations: and, or
  • Mathematical operations: less than (lt), greater-or-equal (ge) and modulus (mod)
  • Indexing methods: index (same as pandas.index) and reindex (same as pandas.reindex)

adamamer20 and others added 30 commits August 4, 2024 12:51
@adamamer20
fix to _df_all and _df_concat
d8cab68
@adamamer20
adding right overload to concat
98bfe11
@adamamer20
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
015edee 
… 53-tests-for-polarsmixin
@adamamer20
change _df_filter to _df_get_masked_df + _df_all
77ad379
@adamamer20
adding custom name to _df_groupby_cumcount
9f757c8
@adamamer20
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
7fe1933 
… 53-tests-for-polarsmixin
@adamamer20
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
b4f757a 
… 53-tests-for-polarsmixin
@adamamer20
adding tests for PolarsMixin
3186a12
@adamamer20
fixes to PolarsMixins
93c7db3
@adamamer20
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
f3543b9 
… 53-tests-for-polarsmixin
@adamamer20
Merge branch 'main' of https://github.com/adamamer20/mesa-frames into…
1ec89ae 
… 53-tests-for-polarsmixin
@adamamer20
Merge branch 'main' into 53-tests-for-polarsmixin
7280243
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
e3e6d91 
for more information, see https://pre-commit.ci
@adamamer20
adding index_cols to _df_join per abstract DataFrameMixin
703b561
@adamamer20
Merge branch '53-tests-for-polarsmixin' of https://github.com/adamame…
7746cc8 
…r20/mesa-frames into 53-tests-for-polarsmixin
@adamamer20
adding greater or equal to DataFrameMixin
089900d
@adamamer20
adding boolean or to DataFrameMixin
e3423a9
@adamamer20
adding less than to DataFrameMixin
58a149d
@adamamer20
adding _df_and and _df_or
7c0f3da
@adamamer20
using mixin logical operations in space
ca42fe5
@adamamer20
fixing collections mixin
e0914ee
@adamamer20
adding modulus to DataFrameMixin
6187c8d
@adamamer20
adding index to DataFrameMixin
5ba1bbe
@adamamer20
fixes to method logic
9ea50e0
@adamamer20
Merge branch '53-tests-for-polarsmixin' of https://github.com/adamame…
a096a5d 
…r20/mesa-frames into comparisons-mixin
@adamamer20
changing % to _df_mod in abstract space
c89a7ef
@adamamer20
adding reindexing DataFrameMixin
4d603d3
@adamamer20
fixing reindex logic
d459f80
@adamamer20
testing _df_or
ce1a0df
@adamamer20
Merge branch 'main' into comparisons-mixin
5bdae00
@adamamer20 adamamer20 self-assigned this Aug 13, 2024
@adamamer20 adamamer20 added the enhancement Improvements to existing features or performance. label Aug 13, 2024
@adamamer20 adamamer20 added this to the 0.1.0 Alpha Release milestone Aug 13, 2024
@adamamer20 adamamer20 requested a review from rht August 13, 2024 16:20
@codecov
Copy link

codecov bot commented Aug 13, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 89.04110% with 16 lines in your changes missing coverage. Please review.

Files Patch % Lines
mesa_frames/concrete/polars/mixin.py 88.17% 11 Missing ⚠️
mesa_frames/concrete/pandas/mixin.py 84.84% 5 Missing ⚠️
Files Coverage Δ
mesa_frames/abstract/mixin.py 100.00% <100.00%> (ø)
mesa_frames/abstract/space.py 89.51% <100.00%> (+0.07%) ⬆️
mesa_frames/concrete/pandas/mixin.py 86.26% <84.84%> (-0.41%) ⬇️
mesa_frames/concrete/polars/mixin.py 90.25% <88.17%> (+63.97%) ⬆️

@rht
Copy link
Contributor

rht commented Aug 13, 2024

Was wondering, is this feature a dependency of Sugarscape IG? If not, under which situation can this be showcased?

@adamamer20
Copy link
Member Author

adamamer20 commented Aug 13, 2024

Was wondering, is this feature a dependency of Sugarscape IG? If not, under which situation can this be showcased?

It's a dependency for GridPolars. Polars DFs do not have mathematical operators (like *, /, +), logical operators (like |, &) or indexes, differently from pandas. This PR bridges the gap, since I used some operators in GridDF. Look here

@adamamer20 adamamer20 merged commit abb4459 into main Aug 14, 2024
@adamamer20 adamamer20 deleted the comparisons-mixin branch August 14, 2024 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@rht rht rht approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@adamamer20 adamamer20

Labels

enhancement Improvements to existing features or performance.

Projects

None yet

Milestone

0.1.0 Alpha Release

Development

Successfully merging this pull request may close these issues.

2 participants

@adamamer20 @rht